request-log-analyzer 1.12.9 → 1.12.10

data/.travis.yml

@@ -14,10 +14,23 @@ rvm:
   - jruby-head
   - rbx-18mode
   - rbx-19mode
+gemfile:
+  - Gemfile.activerecord2
+  - Gemfile.activerecord3
+  - Gemfile.activerecord4
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
+  exclude:
+    - gemfile: Gemfile.activerecord4
+      rvm: 1.8.7
+    - gemfile: Gemfile.activerecord4
+      rvm: ree
+    - gemfile: Gemfile.activerecord4
+      rvm: jruby-18mode
+    - gemfile: Gemfile.activerecord4
+      rvm: rbx-18mode
 notifications:
   email:
     - info@railsdoctors.com

data/Gemfile.activerecord2

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 2.1'
+gem 'activerecord-mysql2-adapter', :platforms => [:ruby]

data/Gemfile.activerecord3

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 3.0'

data/Gemfile.activerecord4

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 4.0'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Willem van Bergen & Bart ten Brinke
+Copyright (c) 2008-2013 Willem van Bergen & Bart ten Brinke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -47,5 +47,4 @@ Bergen (willem@railsdoctors.com) or Bart ten Brinke (bart@railsdoctors.com).
 
 * Project wiki at GitHub: http://github.com/wvanbergen/request-log-analyzer/wiki
 * Issue tracker at GitHub: http://github.com/wvanbergen/request-log-analyzer/issues
-* railsdoctors homepage: http://railsdoctors.com
-* wvanbergen's blog posts: http://techblog.floorplanner.com/tag/request-log-analyzer
+* railsdoctors homepage: http://railsdoctors.com

data/lib/request_log_analyzer/file_format/amazon_s3.rb

@@ -5,14 +5,14 @@ module RequestLogAnalyzer::FileFormat
   # Access logs are disabled by default on Amazon S3. To enable logging, see
   # http://docs.amazonwebservices.com/AmazonS3/latest/index.html?ServerLogs.html
   class AmazonS3 < Base
-    
+
     extend CommonRegularExpressions
 
     line_definition :access do |line|
       line.header = true
       line.footer = true
-      line.regexp = /^([^\ ]+) ([^\ ]+) \[(#{timestamp('%d/%b/%Y:%H:%M:%S %z')})?\] (#{ip_address}) ([^\ ]+) ([^\ ]+) (\w+(?:\.\w+)*) ([^\ ]+) "([^"]+)" (\d+) ([^\ ]+) (\d+) (\d+) (\d+) (\d+) "([^"]*)" "([^"]*)"/
-      
+      line.regexp = /^([^\ ]+) ([^\ ]+) \[(#{timestamp('%d/%b/%Y:%H:%M:%S %z')})?\] (#{ip_address}) ([^\ ]+) ([^\ ]+) (\w+(?:\.\w+)*) ([^\ ]+) "([^"]+)" (\d+) ([^\ ]+) ([^\ ]+) (\d+) (\d+) ([^\ ]+) "([^"]*)" "([^"]*)"/
+
       line.capture(:bucket_owner)
       line.capture(:bucket)
       line.capture(:timestamp).as(:timestamp)

data/lib/request_log_analyzer/file_format/apache.rb

@@ -20,6 +20,7 @@ module RequestLogAnalyzer::FileFormat
     LOG_FORMAT_DEFAULTS = {
       :common   => '%h %l %u %t "%r" %>s %b',
       :combined => '%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+      :vhost_combined => '%h %l %v %t "%r" %>s %b "%{Referer}i" "%{User-agent}i" %T/%D',
       :nginx    => '%a %t %h %u "%r" %>s %b',
       :rack     => '%h %l %u %t "%r" %>s %b %T',
       :referer  => '%{Referer}i -> %U',
@@ -32,6 +33,7 @@ module RequestLogAnalyzer::FileFormat
     # A hash that defines how the log format directives should be parsed.
     LOG_DIRECTIVES = {
       '%' => { nil => { :regexp => '%', :captures => [] } },
+      'v' => { nil => { :regexp => "(#{hostname_or_ip_address})",  :captures => [{:name => :vhost, :type => :string}] } },
       'h' => { nil => { :regexp => "(#{hostname_or_ip_address})",  :captures => [{:name => :remote_host, :type => :string}] } },
       'a' => { nil => { :regexp => "(#{ip_address})", :captures => [{:name => :remote_ip, :type => :string}] } },
       'b' => { nil => { :regexp => '(\d+|-)', :captures => [{:name => :bytes_sent, :type => :traffic}] } },
@@ -41,7 +43,7 @@ module RequestLogAnalyzer::FileFormat
                'milli' => { :regexp => '(\d+|-)', :captures => [ {:name => :duration, :type => :duration, :unit => :msec }] }
              },
       'l' => { nil => { :regexp => '([\w-]+)', :captures => [{:name => :remote_logname, :type => :nillable_string}] } },
-      'T' => { nil => { :regexp => '((?:\d+(?:\.\d+))|-)', :captures => [{:name => :duration, :type => :duration, :unit => :sec}] } },
+      'T' => { nil => { :regexp => '(\d+|-)', :captures => [{:name => :duration, :type => :duration, :unit => :sec}] } },
       't' => { nil => { :regexp => "\\[(#{APACHE_TIMESTAMP})?\\]", :captures => [{:name => :timestamp, :type => :timestamp}] } },
       's' => { nil => { :regexp => '(\d{3})', :captures => [{:name => :http_status, :type => :integer}] } },
       'u' => { nil => { :regexp => '(\w+|-)', :captures => [{:name => :user, :type => :nillable_string}] } },
@@ -66,12 +68,11 @@ module RequestLogAnalyzer::FileFormat
     def self.access_line_definition(format_string)
       format_string ||= :common
       format_string   = LOG_FORMAT_DEFAULTS[format_string.to_sym] || format_string
-      
-      
+
       line_regexp = ''
       captures    = []
       format_string.scan(/([^%]*)(?:%(?:\{([^\}]+)\})?>?([A-Za-z%]))?/) do |literal, arg, variable|
-        
+
         line_regexp << Regexp.quote(literal) # Make sure to parse the literal before the directive
 
         if variable
@@ -87,7 +88,7 @@ module RequestLogAnalyzer::FileFormat
           end
         end
       end
-      
+
       # Return a new line definition object
       return RequestLogAnalyzer::LineDefinition.new(:access, :regexp => Regexp.new(line_regexp),
                                         :captures => captures, :header => true, :footer => true)

data/lib/request_log_analyzer/version.rb

@@ -1,3 +1,3 @@
 module RequestLogAnalyzer
-  VERSION = "1.12.9"
+  VERSION = "1.12.10"
 end

data/request-log-analyzer.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.authors  = ['Willem van Bergen', 'Bart ten Brinke']
   gem.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
   gem.homepage = 'http://railsdoctors.com'
+  gem.license  = "MIT"
 
   gem.summary     = "A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers"
   gem.description = <<-eos
@@ -29,7 +30,7 @@ Gem::Specification.new do |gem|
 
   gem.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec', '~> 2.13')
+  gem.add_development_dependency('rspec', '~> 2.14')
   gem.add_development_dependency('activerecord')
   if defined?(JRUBY_VERSION)
     gem.add_development_dependency('jdbc-sqlite3')

data/spec/lib/helpers.rb

@@ -36,7 +36,7 @@ module RequestLogAnalyzer::RSpec::Helpers
     arguments = arguments.join(' ') if arguments.kind_of?(Array)
 
     output = []
-    IO.popen("#{binary} #{arguments}") do |pipe|
+    IO.popen("#{binary} #{arguments} 2>&1") do |pipe|
       output = pipe.readlines
     end
     $?.exitstatus.should == 0

data/spec/lib/mocks.rb

@@ -1,20 +1,20 @@
 module RequestLogAnalyzer::RSpec::Mocks
 
   def mock_source
-    source = mock('RequestLogAnalyzer::Source::Base')
-    source.stub!(:file_format).and_return(testing_format)
-    source.stub!(:parsed_requests).and_return(2)
-    source.stub!(:skipped_requests).and_return(1)
-    source.stub!(:parse_lines).and_return(10)
+    source = double('RequestLogAnalyzer::Source::Base')
+    source.stub(:file_format).and_return(testing_format)
+    source.stub(:parsed_requests).and_return(2)
+    source.stub(:skipped_requests).and_return(1)
+    source.stub(:parse_lines).and_return(10)
 
-    source.stub!(:warning=)
-    source.stub!(:progress=)
-    source.stub!(:source_changes=)
+    source.stub(:warning=)
+    source.stub(:progress=)
+    source.stub(:source_changes=)
 
-    source.stub!(:prepare)
-    source.stub!(:finalize)
+    source.stub(:prepare)
+    source.stub(:finalize)
 
-    source.stub!(:each_request).
+    source.stub(:each_request).
       and_yield(testing_format.request(:field => 'value1')).
       and_yield(testing_format.request(:field => 'value2'))
 
@@ -22,51 +22,51 @@ module RequestLogAnalyzer::RSpec::Mocks
   end
 
   def mock_io
-    mio = mock('IO')
-    mio.stub!(:print)
-    mio.stub!(:puts)
-    mio.stub!(:write)
+    mio = double('IO')
+    mio.stub(:print)
+    mio.stub(:puts)
+    mio.stub(:write)
     return mio
   end
 
   def mock_output
-    output = mock('RequestLogAnalyzer::Output::Base')
-    output.stub!(:report_tracker)
-    output.stub!(:header)
-    output.stub!(:footer)
-    output.stub!(:puts)
-    output.stub!(:<<)
-    output.stub!(:colorize).and_return("Fancy text")
-    output.stub!(:link)
-    output.stub!(:title)
-    output.stub!(:line)
-    output.stub!(:with_style)
-    output.stub!(:table).and_yield([])
-    output.stub!(:io).and_return(mock_io)
-    output.stub!(:options).and_return({})
-    output.stub!(:slice_results).and_return { |a| a } 
+    output = double('RequestLogAnalyzer::Output::Base')
+    output.stub(:report_tracker)
+    output.stub(:header)
+    output.stub(:footer)
+    output.stub(:puts)
+    output.stub(:<<)
+    output.stub(:colorize).and_return("Fancy text")
+    output.stub(:link)
+    output.stub(:title)
+    output.stub(:line)
+    output.stub(:with_style)
+    output.stub(:table).and_yield([])
+    output.stub(:io).and_return(mock_io)
+    output.stub(:options).and_return({})
+    output.stub(:slice_results).and_return { |a| a } 
     return output
   end
 
   def mock_database(*stubs)
-    database = mock('RequestLogAnalyzer::Database')
-    database.stub!(:connect)
-    database.stub!(:disconnect)
-    database.stub!(:connection).and_return(mock_connection)
-    stubs.each { |s| database.stub!(s)}
+    database = double('RequestLogAnalyzer::Database')
+    database.stub(:connect)
+    database.stub(:disconnect)
+    database.stub(:connection).and_return(mock_connection)
+    stubs.each { |s| database.stub(s)}
     return database
   end
 
   def mock_connection
-    table_creator = mock('ActiveRecord table creator')
-    table_creator.stub!(:column)
+    table_creator = double('ActiveRecord table creator')
+    table_creator.stub(:column)
 
-    connection = mock('ActiveRecord::Base.connection')
-    connection.stub!(:add_index)
-    connection.stub!(:remove_index)
-    connection.stub!(:table_exists?).and_return(false)
-    connection.stub!(:create_table).and_yield(table_creator).and_return(true)
-    connection.stub!(:table_creator).and_return(table_creator)
+    connection = double('ActiveRecord::Base.connection')
+    connection.stub(:add_index)
+    connection.stub(:remove_index)
+    connection.stub(:table_exists?).and_return(false)
+    connection.stub(:create_table).and_yield(table_creator).and_return(true)
+    connection.stub(:table_creator).and_return(table_creator)
     return connection
   end
 end

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -13,7 +13,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter 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)
+      RequestLogAnalyzer::Database.stub(:new).and_return(@database)
     end
 
     it 'should establish the database connection' do

data/spec/unit/controller/controller_spec.rb

@@ -4,8 +4,8 @@ describe RequestLogAnalyzer::Controller do
 
   it "should use a custom output generator correctly" do
     
-    mock_output = mock('RequestLogAnalyzer::Output::Base')
-    mock_output.stub!(:io).and_return(mock_io)
+    mock_output = double('RequestLogAnalyzer::Output::Base')
+    mock_output.stub(:io).and_return(mock_io)
     mock_output.should_receive(:header)
     mock_output.should_receive(:footer)
 
@@ -17,7 +17,7 @@ describe RequestLogAnalyzer::Controller do
   it "should call aggregators correctly when run" do
     controller  = RequestLogAnalyzer::Controller.new(mock_source, :output => mock_output)
     
-    mock_aggregator = mock('RequestLogAnalyzer::Aggregator::Base') 
+    mock_aggregator = double('RequestLogAnalyzer::Aggregator::Base') 
     mock_aggregator.should_receive(:prepare).once.ordered
     mock_aggregator.should_receive(:aggregate).with(an_instance_of(testing_format.request_class)).twice.ordered
     mock_aggregator.should_receive(:finalize).once.ordered
@@ -30,7 +30,7 @@ describe RequestLogAnalyzer::Controller do
   it "should call filters when run" do
     controller  = RequestLogAnalyzer::Controller.new(mock_source, :output => mock_output)
     
-    mock_filter = mock('RequestLogAnalyzer::Filter::Base')
+    mock_filter = double('RequestLogAnalyzer::Filter::Base')
     mock_filter.should_receive(:filter).twice.and_return(nil)
     controller.should_receive(:aggregate_request).twice.and_return(nil)
     

data/spec/unit/database/base_class_spec.rb

@@ -11,17 +11,17 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     before(:each) do
-      @orm_class = mock('Line ActiveRecord::Base class')
-      @orm_class.stub!("table_name=")
-      @orm_class.stub!(:belongs_to)
-      @orm_class.stub!(:serialize)
-      @orm_class.stub!(:line_definition=)
+      @orm_class = double('Line ActiveRecord::Base class')
+      @orm_class.stub("table_name=")
+      @orm_class.stub(:belongs_to)
+      @orm_class.stub(:serialize)
+      @orm_class.stub(:line_definition=)
 
-      RequestLogAnalyzer::Database::Request.stub!(:has_many)
-      RequestLogAnalyzer::Database::Source.stub!(:has_many)
+      RequestLogAnalyzer::Database::Request.stub(:has_many)
+      RequestLogAnalyzer::Database::Source.stub(:has_many)
 
       @database = mock_database
-      RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
+      RequestLogAnalyzer::Database::Base.stub(:database).and_return(@database)
     end
 
     it "should create a new subclass using the Base class as parent" do
@@ -68,17 +68,17 @@ describe RequestLogAnalyzer::Database::Base do
   describe '.subclass_from_table' do
     before(:each) do
 
-      RequestLogAnalyzer::Database::Request.stub!(:has_many)
-      RequestLogAnalyzer::Database::Source.stub!(:has_many)
+      RequestLogAnalyzer::Database::Request.stub(:has_many)
+      RequestLogAnalyzer::Database::Source.stub(:has_many)
 
       @database = mock_database
-      @database.connection.stub!(:table_exists?).and_return(true)
-      RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
+      @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!("table_name=")
-      @klass.stub!(:belongs_to)
+      @klass = double('ActiveRecord ORM class')
+      @klass.stub(:column_names).and_return(['id', 'request_id', 'source_id', 'lineno', 'duration'])
+      @klass.stub("table_name=")
+      @klass.stub(:belongs_to)
     end
 
     it "should set the table name" do
@@ -118,9 +118,9 @@ describe RequestLogAnalyzer::Database::Base do
 
     before(:each) do
       @database = RequestLogAnalyzer::Database.new
-      @database.stub!(:connection).and_return(mock_connection)
+      @database.stub(:connection).and_return(mock_connection)
       @klass = @database.load_activerecord_class(@line_definition)
-      @klass.stub!(:table_exists?).and_return(false)
+      @klass.stub(:table_exists?).and_return(false)
     end
 
     after(:each) do
@@ -134,7 +134,7 @@ describe RequestLogAnalyzer::Database::Base do
     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)
+      @klass.stub(:table_exists?).and_return(true)
       @database.connection.should_not_receive(:create_table).with(:test_lines)
       @klass.create_table!
     end

data/spec/unit/database/database_spec.rb

@@ -51,11 +51,11 @@ describe RequestLogAnalyzer::Database do
     before(:each) do
       @database = RequestLogAnalyzer::Database.new
       @database.file_format = testing_format
-      @database.stub!(:connection).and_return(mock_connection)
+      @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!)
+      @mock_class.stub(:create_table!)
     end
 
     after(:each) { @database.remove_orm_classes! }
@@ -92,16 +92,16 @@ describe RequestLogAnalyzer::Database do
     before(:each) do
       @database = RequestLogAnalyzer::Database.new
       @connection = mock_connection
-      @database.stub!(:connection).and_return(@connection)
+      @database.stub(:connection).and_return(@connection)
 
       # Mock the has_many method of the defaukt ORM classes
-      RequestLogAnalyzer::Database::Request.stub!(:has_many)
-      RequestLogAnalyzer::Database::Source.stub!(:has_many)
+      RequestLogAnalyzer::Database::Request.stub(:has_many)
+      RequestLogAnalyzer::Database::Source.stub(:has_many)
 
       @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)
+      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! }

data/spec/unit/file_format/amazon_s3_format_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::AmazonS3 do
-  
+
   subject { RequestLogAnalyzer::FileFormat.load(:amazon_s3) }
 
   it { should be_well_formed }
@@ -12,55 +12,77 @@ describe RequestLogAnalyzer::FileFormat::AmazonS3 do
 
   let(:sample_get)  { '2f88111968424e6306bf4d292c0188ccb94ff9374ea2836b50a1a79f7cd656e1 sample-bucket [06/Oct/2006:01:42:14 +0000] 207.171.172.6 65a011a29cdf8ec533ec3d1ccaae921c C980091AD89C936A REST.GET.OBJECT object.png "GET /sample-bucket/object.png HTTP/1.1" 200 - 1243 1243 988 987 "-" "aranhabot"' }
   let(:sample_copy) { '09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a testbucket [03/Mar/2010:23:04:59 +0000] 174.119.31.76 09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a ACCC34B843C87BC9 REST.COPY.OBJECT files/image.png "PUT /files/image.png HTTP/1.1" 200 - 234 65957 365 319 "-" "" -' }
-  
+  let(:sample_2013) { 'ccc30d58fff2fad852150fa6f9e7bd14b5f6d2ea83f2deec4a610bf0f0a8f7ac testbucket [17/Sep/2013:15:53:53 +0000] 87.193.165.87 - A9774F82F053FACE REST.GET.OBJECT somefile.txt "GET /testbucket/somefile.txt HTTP/1.1" 304 - - 1071 9 - "https://s3-console-us-standard.console.aws.amazon.com/GetResource/Console.html?region=eu-west-1&pageLoadStartTime=1379427139127&locale=en_US" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.65 Safari/537.36" -' }
+
   describe '#parse_line' do
-    it { should parse_line(sample_get, 'a GET line').and_capture(
-              :bucket_owner    => '2f88111968424e6306bf4d292c0188ccb94ff9374ea2836b50a1a79f7cd656e1',
-              :bucket          => 'sample-bucket',
-              :timestamp       => 20061006014214,
-              :remote_ip       => '207.171.172.6',
-              :key             => 'object.png',
-              :operation       => 'REST.GET.OBJECT',
-              :requester       => '65a011a29cdf8ec533ec3d1ccaae921c',
-              :request_id      => 'C980091AD89C936A',
-              :request_uri     => 'GET /sample-bucket/object.png HTTP/1.1',
-              :error_code      => nil,
-              :http_status     => 200,
-              :total_time      => 0.988,
-              :turnaround_time => 0.987,
-              :bytes_sent      => 1243,
-              :object_size     => 1243,
-              :user_agent      => 'aranhabot',
-              :referer         => nil) 
+    it {
+      should parse_line(sample_get, 'a GET line').and_capture(
+        :bucket_owner    => '2f88111968424e6306bf4d292c0188ccb94ff9374ea2836b50a1a79f7cd656e1',
+        :bucket          => 'sample-bucket',
+        :timestamp       => 20061006014214,
+        :remote_ip       => '207.171.172.6',
+        :key             => 'object.png',
+        :operation       => 'REST.GET.OBJECT',
+        :requester       => '65a011a29cdf8ec533ec3d1ccaae921c',
+        :request_id      => 'C980091AD89C936A',
+        :request_uri     => 'GET /sample-bucket/object.png HTTP/1.1',
+        :error_code      => nil,
+        :http_status     => 200,
+        :total_time      => 0.988,
+        :turnaround_time => 0.987,
+        :bytes_sent      => 1243,
+        :object_size     => 1243,
+        :user_agent      => 'aranhabot',
+        :referer         => nil)
+    }
+
+    it { should parse_line(sample_2013, '2013 sample').and_capture(
+        :bucket_owner    => 'ccc30d58fff2fad852150fa6f9e7bd14b5f6d2ea83f2deec4a610bf0f0a8f7ac',
+        :bucket          => 'testbucket',
+        :timestamp       => 20130917155353,
+        :remote_ip       => '87.193.165.87',
+        :requester       => '-',
+        :request_id      => 'A9774F82F053FACE',
+        :operation       => 'REST.GET.OBJECT',
+        :key             => 'somefile.txt',
+        :request_uri     => "GET /testbucket/somefile.txt HTTP/1.1",
+        :http_status     => 304,
+        :error_code      => nil,
+        :bytes_sent      => 0,
+        :object_size     => 1071,
+        :total_time      => 0.009,
+        :turnaround_time => 0,
+        :referer         => "https://s3-console-us-standard.console.aws.amazon.com/GetResource/Console.html?region=eu-west-1&pageLoadStartTime=1379427139127&locale=en_US",
+        :user_agent      => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.65 Safari/537.36")
     }
 
-    it { should parse_line(sample_copy, 'a COPY line').and_capture(
-              :bucket_owner    => '09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a',
-              :bucket          => 'testbucket',
-              :timestamp       => 20100303230459,
-              :remote_ip       => '174.119.31.76',
-              :key             => 'files/image.png',
-              :operation       => 'REST.COPY.OBJECT',
-              :requester       => '09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a',
-              :request_id      => 'ACCC34B843C87BC9',
-              :request_uri     => 'PUT /files/image.png HTTP/1.1',
-              :error_code      => nil,
-              :http_status     => 200,
-              :total_time      => 0.365,
-              :turnaround_time => 0.319,
-              :bytes_sent      => 234,
-              :object_size     => 65957,
-              :user_agent      => '',
-              :referer         => nil) 
+    it {should parse_line(sample_copy, 'a COPY line').and_capture(
+        :bucket_owner    => '09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a',
+        :bucket          => 'testbucket',
+        :timestamp       => 20100303230459,
+        :remote_ip       => '174.119.31.76',
+        :key             => 'files/image.png',
+        :operation       => 'REST.COPY.OBJECT',
+        :requester       => '09216466b5571a8db0bf5abca72041fd3fc163e5eb83c51159735353ac6a2b9a',
+        :request_id      => 'ACCC34B843C87BC9',
+        :request_uri     => 'PUT /files/image.png HTTP/1.1',
+        :error_code      => nil,
+        :http_status     => 200,
+        :total_time      => 0.365,
+        :turnaround_time => 0.319,
+        :bytes_sent      => 234,
+        :object_size     => 65957,
+        :user_agent      => '',
+        :referer         => nil)
     }
 
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
-  
+
   describe '#parse_io' do
     let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
     let(:snippet) { log_snippet(sample_get, sample_copy, 'nonsense line') }
-    
+
     it "should parse requests correctly and not generate warnings" do
       log_parser.should_receive(:handle_request).twice
       log_parser.should_not_receive(:warn)

data/spec/unit/file_format/apache_format_spec.rb

@@ -26,18 +26,18 @@ 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)
@@ -53,36 +53,50 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     it { should have(8).report_trackers }
   end
 
+  context '"vhost_combined" access log parsing' do
+    subject { RequestLogAnalyzer::FileFormat.load(:apache, :vhost_combined) }
+    describe '#parse_line' do
+      let(:sample1) { '72.204.80.86 - psi-equipment.od1.vtiger.com [19/Oct/2013:15:41:54 +0000] "GET /vtiger6/layouts/vlayout/modules/Vtiger/resources/Vtiger.js?&v=5.10.38 HTTP/1.1" 304 - "https://psi-equipment.od1.vtiger.com/vtiger6/index.php?module=PrintTemplates&view=Detail&record=29" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36" 1/683'}
+
+      it { should parse_line(sample1, 'a sample line').and_capture(
+            :remote_host    => '72.204.80.86', :remote_logname => nil, :user        => nil,
+            :vhost => 'psi-equipment.od1.vtiger.com', :duration => 1.0,
+            :timestamp      => 20131019154154, :http_status    => 304, :http_method => 'GET',
+            :http_version   => '1.1',          :bytes_sent     => 0)
+      }
+    end
+  end
+
   context '"Common" access log parsing' do
-    subject { RequestLogAnalyzer::FileFormat.load(:apache, :common) } 
-    
+    subject { RequestLogAnalyzer::FileFormat.load(:apache, :common) }
+
     it { should be_well_formed }
     it { should have_line_definition(:access).capturing(:remote_host, :remote_logname, :user, :timestamp, :http_status, :http_method, :http_version, :bytes_sent) }
     it { should have(6).report_trackers }
-    
+
     describe '#parse_line' do
-      
+
       let(:sample1) { '1.129.119.13 - - [08/Sep/2009:07:54:09 -0400] "GET /profile/18543424 HTTP/1.0" 200 8223' }
       let(:sample2) { '1.82.235.29 - - [08/Sep/2009:07:54:05 -0400] "GET /gallery/fresh?page=23&per_page=16 HTTP/1.1" 200 23414' }
-      
+
       it { should parse_line(sample1, 'a sample line').and_capture(
             :remote_host    => '1.129.119.13', :remote_logname => nil, :user        => nil,
             :timestamp      => 20090908075409, :http_status    => 200, :http_method => 'GET',
             :http_version   => '1.0',          :bytes_sent     => 8223)
       }
-      
+
       it { should parse_line(sample2, 'another sample line').and_capture(
             :remote_host    => '1.82.235.29',  :remote_logname => nil, :user        => nil,
             :timestamp      => 20090908075405, :http_status    => 200, :http_method => 'GET',
             :http_version   => '1.1',          :bytes_sent     => 23414)
       }
-      
+
       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 log snippet successfully without warnings" do
         log_parser.should_receive(:handle_request).exactly(10).times
         log_parser.should_not_receive(:warn)
@@ -92,36 +106,36 @@ describe RequestLogAnalyzer::FileFormat::Apache do
   end
 
   context '"Combined" access log parsing' do
-    subject { RequestLogAnalyzer::FileFormat.load(:apache, :combined) } 
-    
+    subject { RequestLogAnalyzer::FileFormat.load(:apache, :combined) }
+
     it { should be_well_formed }
     it { should have_line_definition(:access).capturing(:remote_host, :remote_logname, :user, :timestamp, :http_status, :http_method, :http_version, :bytes_sent, :referer, :user_agent) }
     it { should have(8).report_trackers }
-    
+
     describe '#parse_line' do
       let(:sample1) { '69.41.0.45 - - [02/Sep/2009:12:02:40 +0200] "GET //phpMyAdmin/ HTTP/1.1" 404 209 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)"' }
       let(:sample2) { '0:0:0:0:0:0:0:1 - - [02/Sep/2009:05:08:33 +0200] "GET / HTTP/1.1" 200 30 "-" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9"' }
-      
+
       it { should parse_line(sample1, 'with IPv4 address').and_capture(
             :remote_host  => '69.41.0.45',   :remote_logname => nil, :user        => nil,
             :timestamp    => 20090902120240, :http_status    => 404, :http_method => 'GET',
             :http_version => '1.1',          :bytes_sent     => 209, :referer     => nil,
             :user_agent   => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)')
       }
-      
+
       it { should parse_line(sample2, 'with IPv6 address').and_capture(
             :remote_host  => '0:0:0:0:0:0:0:1', :remote_logname => nil, :user        => nil,
             :timestamp    => 20090902050833,    :http_status    => 200, :http_method => 'GET',
             :http_version => '1.1',             :bytes_sent     => 30,  :referer     => nil,
             :user_agent   => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9')
       }
-      
+
       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 log snippet successfully without warnings" do
         log_parser.should_receive(:handle_request).exactly(5).times
         log_parser.should_not_receive(:warn)

data/spec/unit/file_format/line_definition_spec.rb

@@ -31,7 +31,7 @@ describe RequestLogAnalyzer::LineDefinition do
   end
 
   describe '#convert_captured_values' do
-    let(:request) { mock('request', :convert_value => 'foo') }
+    let(:request) { double('request', :convert_value => 'foo') }
 
     it "should call convert_value for every captured value" do
       request.should_receive(:convert_value).twice
@@ -50,8 +50,8 @@ describe RequestLogAnalyzer::LineDefinition do
       } 
       
       before do
-        request.stub!(:convert_value).with("{:bar=>'baz'}", anything).and_return(:bar => 'baz')
-        request.stub!(:convert_value).with('baz', anything).and_return('foo')
+        request.stub(:convert_value).with("{:bar=>'baz'}", anything).and_return(:bar => 'baz')
+        request.stub(:convert_value).with('baz', anything).and_return('foo')
       end
 
       it "should call Request#convert_value for the initial hash and the value in the hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-log-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.12.9
+  version: 1.12.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,9 @@ files:
 - .travis.yml
 - DESIGN.rdoc
 - Gemfile
+- Gemfile.activerecord2
+- Gemfile.activerecord3
+- Gemfile.activerecord4
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -276,7 +279,8 @@ files:
 - spec/unit/tracker/traffic_tracker_spec.rb
 - tasks/request_log_analyzer.rake
 homepage: http://railsdoctors.com
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --title
@@ -295,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4176554289530285347
+      hash: -262165736928167385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -304,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4176554289530285347
+      hash: -262165736928167385
 requirements:
 - To use the database inserter, ActiveRecord and an appropriate database adapter are
   required.