request-log-analyzer 1.9.6 → 1.9.7

data/README.rdoc

@@ -24,6 +24,16 @@ request-log-analyzer like this:
 
 For more details, other file formats, and available command line options, see the project's wiki at http://github.com/wvanbergen/request-log-analyzer/wiki
 
+== Benchmarking on different rubies
+
+  $ time ./bin/request-log-analyzer 40MBRailsFile.log
+
+  ruby-1.9.2-p0   15.19s user 0.95s system 99% cpu 16.143 total
+  ruby-1.8.7      25.21s user 1.02s system 99% cpu 26.238 total
+  jruby-1.5.3     32.64s user 4.84s system 99% cpu 37.629 total
+  rbx             46.60s user 2.71s system 108% cpu 45.324 total
+  macruby         75.00s user 20.10s system 110% cpu 1:26.13 total
+
 == Additional information
 
 Request-log-analyzer was designed and built by Willem van Bergen and Bart ten

data/lib/request_log_analyzer.rb

@@ -13,7 +13,7 @@ module RequestLogAnalyzer
 
   # The current version of request-log-analyzer.
   # Do not change the value by hand; it will be updated automatically by the gem release script.
-  VERSION = "1.9.6"
+  VERSION = "1.9.7"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

data/lib/request_log_analyzer/file_format/rails3.rb

@@ -12,7 +12,7 @@ module RequestLogAnalyzer::FileFormat
     line_definition :started do |line|
       line.header = true
       line.teaser = /Started /
-      line.regexp = /Started ([A-Z]+) "([^"]+)" for (#{ip_address}) at (#{timestamp('%a %b %d %H:%M:%S %z %Y')})/
+      line.regexp = /Started ([A-Z]+) "([^"]+)" for (#{ip_address}) at (#{timestamp('%a %b %d %H:%M:%S %z %Y')}|#{timestamp('%Y-%m-%d %H:%M:%S %z')})/
       
       line.capture(:method)
       line.capture(:path)
@@ -85,14 +85,23 @@ module RequestLogAnalyzer::FileFormat
       MONTHS = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
       
       def convert_timestamp(value, definition)
-        value.gsub!(/\W/,'')
-        time_as_str = value[-4..-1] # year
-        # convert the month to a 2-digit representation
-        month = MONTHS.index(value[3..5])+1
-        month < 10 ? time_as_str << "0#{month}" : time_as_str << month.to_s
-        
-        time_as_str << value[6..13] # day of month + time
-        time_as_str.to_i
+        # the time value can be in 2 formats: 
+        # - 2010-10-26 02:27:15 +0000 (ruby 1.9.2)
+        # - Thu Oct 25 16:15:18 -0800 2010
+        if value =~ /^#{CommonRegularExpressions::TIMESTAMP_PARTS['Y']}/
+          value.gsub!(/\W/,'')
+          value[0..13].to_i
+        else
+          value.gsub!(/\W/,'')
+          time_as_str = value[-4..-1] # year
+          # convert the month to a 2-digit representation
+          month = MONTHS.index(value[3..5])+1
+          month < 10 ? time_as_str << "0#{month}" : time_as_str << month.to_s
+
+          time_as_str << value[6..13] # day of month + time
+          time_as_str.to_i
+        end
+
       end
     end
 

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.9.6"
-  s.date    = "2010-10-18"
+  s.version = "1.9.7"
+  s.date    = "2010-10-28"
 
   s.rubyforge_project = 'r-l-a'
 

data/spec/unit/file_format/rails3_format_spec.rb

@@ -20,6 +20,12 @@ describe RequestLogAnalyzer::FileFormat::Rails do
       @file_format.should parse_line(line).as(:started).and_capture(:method => 'GET',
             :path => '/queries', :ip => '127.0.0.1', :timestamp => 20101025161518)
     end
+    
+    it "should parse :started lines in Ruby 1.9.2 format correctly" do
+      line = 'Started GET "/queries" for 127.0.0.1 at 2010-10-26 02:27:15 +0000'
+      @file_format.should parse_line(line).as(:started).and_capture(:method => 'GET',
+            :path => '/queries', :ip => '127.0.0.1', :timestamp => 20101026022715)
+    end
 
     it "should parse :processing lines correctly" do
       line = ' Processing by QueriesController#index as HTML'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 6
-  version: 1.9.6
+  - 7
+  version: 1.9.7
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +02:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,7 +34,6 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -49,7 +47,6 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -62,7 +59,6 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -235,7 +231,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -243,7 +238,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -253,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers