request-log-analyzer 1.9.1 → 1.9.2

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.1"
+  VERSION = "1.9.2"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

data/lib/request_log_analyzer/file_format/rails.rb

@@ -82,7 +82,7 @@ module RequestLogAnalyzer::FileFormat
 
     # Rails > 2.1 completed line example
     # Completed in 614ms (View: 120, DB: 31) | 200 OK [http://floorplanner.local/demo]
-    RAILS_22_COMPLETED = /Completed in (\d+)ms \((?:View: (\d+), )?DB: (\d+)\) \| (\d\d\d).+\[(http.+)\]/
+    RAILS_22_COMPLETED = /Completed in (\d+)ms \((?:View: (\d+))?(?:, DB: (\d+)\))? \| (\d\d\d).+\[(http.+)\]/
 
     # A hash of definitions for all common lines in Rails logs.
     LINE_DEFINITIONS = {

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.1"
-  s.date    = "2010-09-29"
+  s.version = "1.9.2"
+  s.date    = "2010-10-01"
 
   s.rubyforge_project = 'r-l-a'
 

data/spec/unit/file_format/format_autodetection_spec.rb

@@ -5,32 +5,32 @@ 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/rails3_format_spec.rb

@@ -21,19 +21,12 @@ describe RequestLogAnalyzer::FileFormat::Rails do
         :controller => 'QueriesController', :action => 'index', :format => 'HTML')
     end
     
-    
-    # it "should parse beta :completed lines correctly" do
-    #   line = 'Completed in 9ms (Views: 4.9ms | ActiveRecord: 0.5ms) with 200'
-    #   @file_format.should parse_line(line).as(:completed).and_capture(
-    #       :duration => 0.009, :status => 200)
-    # end
-    
     it "should parse :completed lines correctly" do
       line = 'Completed 200 OK in 170ms (Views: 78.4ms | ActiveRecord: 48.2ms)'
       @file_format.should parse_line(line).as(:completed).and_capture(
           :duration => 0.170, :status => 200)
     end
-    
+
     it "should pase :failure lines correctly" do
       line = "ActionView::Template::Error (undefined local variable or method `field' for #<Class>) on line #3 of /Users/willem/Code/warehouse/app/views/queries/execute.csv.erb:"
       @file_format.should parse_line(line).as(:failure).and_capture(:line => 3, 

data/spec/unit/file_format/rails_format_spec.rb

@@ -75,6 +75,11 @@ describe RequestLogAnalyzer::FileFormat::Rails do
           @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.614, :db => 0.031, :view => 0.120, :status => 200, :url => 'http://floorplanner.local/demo')
         end
 
+        it "should parse a Rails 2.2 style :completed line correctly when AR is disabled" do
+          line = prefix + 'Completed in 597ms (View: 298 | 200 OK [http://shapado.com]'
+          @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.597, :db => nil, :view => 0.298, :status => 200, :url => 'http://shapado.com')
+        end
+
         it "should parse a :failure line with exception correctly" do
           line = prefix + "NoMethodError (undefined method `update_domain_account' for nil:NilClass):"
           @rails.should parse_line(line).as(:failure).and_capture(:error => 'NoMethodError', :message => "undefined method `update_domain_account' for nil:NilClass")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  hash: 49
   prerelease: false
   segments: 
   - 1
   - 9
-  - 1
-  version: 1.9.1
+  - 2
+  version: 1.9.2
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +02:00
+date: 2010-10-01 00:00:00 +02: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 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -37,11 +34,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,11 +46,9 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -65,11 +58,9 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -239,27 +230,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 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