request-log-analyzer 1.11.1 → 1.12.0

data/bin/request-log-analyzer

@@ -17,6 +17,8 @@ begin
 
     command_line.command(:console) do |cons|
       cons.option(:database, :alias => :d, :required => true)
+      cons.option(:format, :alias => :f)
+      cons.option(:apache_format)
     end
 
     command_line.command(:strip) do |strip|

data/lib/cli/database_console.rb

@@ -8,7 +8,7 @@ class DatabaseConsole
   end
 
   def run!
-    libraries = ['irb/completion', 'rubygems', './lib/request_log_analyzer', './lib/cli/database_console_init']
+    libraries = ['irb/completion', 'rubygems','./lib/cli/database_console_init']
     libaries_string = libraries.map { |l| "-r #{l}" }.join(' ')
 
     ENV['RLA_DBCONSOLE_DATABASE'] = @arguments[:database]

data/lib/cli/database_console_init.rb

@@ -1,5 +1,7 @@
 # Setup the include path
-$:.unshift(File.expand_path('..', File.dirname(__FILE__))
+$:.unshift(File.expand_path('..', File.dirname(__FILE__)))
+require 'request_log_analyzer'
+require 'request_log_analyzer/database'
 
 $database = RequestLogAnalyzer::Database.new(ENV['RLA_DBCONSOLE_DATABASE'])
 $database.load_database_schema!

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.11.1"
+  VERSION = "1.12.0"
 
   # Convert a string/symbol in camelcase ({RequestLogAnalyzer::Controller}) to underscores 
   # (<tt>request_log_analyzer/controller</tt>). This function can be used to load the file (using 

data/lib/request_log_analyzer/database/base.rb

@@ -24,8 +24,8 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
     klass.line_definition = definition
 
     # Set relations with requests and sources table
-    klass.belongs_to :request
-    klass.belongs_to :source
+    klass.belongs_to :request, :class_name => RequestLogAnalyzer::Database::Request.name
+    klass.belongs_to :source, :class_name => RequestLogAnalyzer::Database::Source.name
 
     # Serialize complex fields into the database
     definition.captures.select { |c| c.has_key?(:provides) }.each do |capture|
@@ -45,12 +45,12 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
     klass.set_table_name(table)
 
     if klass.column_names.include?('request_id')
-      klass.belongs_to :request
+      klass.belongs_to :request, :class_name => RequestLogAnalyzer::Database::Request.name
       RequestLogAnalyzer::Database::Request.has_many table.to_sym
     end
 
     if klass.column_names.include?('source_id')
-      klass.belongs_to :source
+      klass.belongs_to :source, :class_name => RequestLogAnalyzer::Database::Source.name
       RequestLogAnalyzer::Database::Source.has_many table.to_sym
     end
 

data/lib/request_log_analyzer/file_format/rails3.rb

@@ -2,7 +2,7 @@ module RequestLogAnalyzer::FileFormat
 
   # Default FileFormat class for Rails 3 logs.
   #
-  # For now, this is just a basic implementation. It will probaby change after 
+  # For now, this is just a basic implementation. It will probaby change after
   # Rails 3 final has been released.
   class Rails3 < Base
 
@@ -32,14 +32,14 @@ module RequestLogAnalyzer::FileFormat
 
     # Parameters: {"action"=>"cached", "controller"=>"cached"}
     line_definition :parameters do |line|
-      line.teaser   = /  Parameters:/
-      line.regexp   = /  Parameters:\s+(\{.*\})/
+      line.teaser = / Parameters:/
+      line.regexp = / Parameters:\s+(\{.*\})/
       line.capture(:params).as(:eval)
     end
     
     # Completed 200 OK in 224ms (Views: 200.2ms | ActiveRecord: 3.4ms)
     # Completed 302 Found in 23ms
-    # Completed   in 189ms
+    # Completed in 189ms
     line_definition :completed do |line|
       line.footer = true
       line.teaser = /Completed /
@@ -63,8 +63,8 @@ module RequestLogAnalyzer::FileFormat
     end
     
     # # Not parsed at the moment:
-    #  SQL (0.2ms)  SET SQL_AUTO_IS_NULL=0
-    #  Query Load (0.4ms)  SELECT `queries`.* FROM `queries`
+    # SQL (0.2ms) SET SQL_AUTO_IS_NULL=0
+    # Query Load (0.4ms) SELECT `queries`.* FROM `queries`
     # Rendered collection (0.0ms)
     # Rendered queries/index.html.erb (0.6ms)
     
@@ -79,9 +79,9 @@ module RequestLogAnalyzer::FileFormat
       analyze.frequency :method, :title => 'HTTP methods'
       analyze.frequency :status, :title => 'HTTP statuses returned'
       
-      analyze.duration :duration, :category => REQUEST_CATEGORIZER, :title => "Request duration",    :line_type => :completed
-      analyze.duration :view,     :category => REQUEST_CATEGORIZER, :title => "View rendering time", :line_type => :completed
-      analyze.duration :db,       :category => REQUEST_CATEGORIZER, :title => "Database time",       :line_type => :completed
+      analyze.duration :duration, :category => REQUEST_CATEGORIZER, :title => "Request duration", :line_type => :completed
+      analyze.duration :view, :category => REQUEST_CATEGORIZER, :title => "View rendering time", :line_type => :completed
+      analyze.duration :db, :category => REQUEST_CATEGORIZER, :title => "Database time", :line_type => :completed
       
       analyze.frequency :category => REQUEST_CATEGORIZER, :title => 'Process blockers (> 1 sec duration)',
         :if => lambda { |request| request[:duration] && request[:duration] > 1.0 }
@@ -92,7 +92,7 @@ module RequestLogAnalyzer::FileFormat
       MONTHS = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
       
       def convert_timestamp(value, definition)
-        # the time value can be in 2 formats: 
+        # 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']}/
@@ -113,4 +113,4 @@ module RequestLogAnalyzer::FileFormat
     end
 
   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.11.1"
-  s.date    = "2011-08-20"
+  s.version = "1.12.0"
+  s.date    = "2012-01-25"
 
   s.rubyforge_project = 'r-l-a'
 

data/spec/unit/database/base_class_spec.rb

@@ -42,7 +42,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set the :belongs_to relationship with the Request class" do
-      @orm_class.should_receive(:belongs_to).with(:request)
+      @orm_class.should_receive(:belongs_to).with(:request, {:class_name=>"RequestLogAnalyzer::Database::Request"})
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -57,7 +57,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set the :belongs_to relationship with the Source class" do
-      @orm_class.should_receive(:belongs_to).with(:source)
+      @orm_class.should_receive(:belongs_to).with(:source, {:class_name=>"RequestLogAnalyzer::Database::Source"})
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -96,7 +96,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should create the :belongs_to relation to the request class" do
-      @klass.should_receive(:belongs_to).with(:request)
+      @klass.should_receive(:belongs_to).with(:request, {:class_name=>"RequestLogAnalyzer::Database::Request"})
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
@@ -106,7 +106,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should create the :belongs_to relation to the source class" do
-      @klass.should_receive(:belongs_to).with(:source)
+      @klass.should_receive(:belongs_to).with(:source, {:class_name=>"RequestLogAnalyzer::Database::Source"})
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 

metadata

@@ -1,81 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: request-log-analyzer
-version: !ruby/object:Gem::Version
-  version: 1.11.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.12.0
 platform: ruby
-authors:
+authors: 
 - Willem van Bergen
 - Bart ten Brinke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000 -04:00
-default_executable: request-log-analyzer
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2153310460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153310460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2153309700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *2153309700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2153309000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153309000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &2153308320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2153308320
-description: ! "    Request log analyzer's purpose is to find out how your web application
-  is being used, how it performs and to\n    focus your optimization efforts. This
-  tool will parse all requests in the application's log file and aggregate the \n
-  \   information. Once it is finished parsing the log file(s), it will show the requests
-  that take op most server time \n    using various metrics. It can also insert all
-  parsed request information into a database so you can roll your own\n    analysis.
-  It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3
-  access logs and MySQL \n    slow query logs out of the box, but file formats of
-  other applications can easily be supported by supplying an \n    easy to write log
-  file format definition.\n"
-email:
+  version_requirements: *id004
+description: "    Request log analyzer's purpose is to find out how your web application is being used, how it performs and to\n    focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the \n    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time \n    using various metrics. It can also insert all parsed request information into a database so you can roll your own\n    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL \n    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an \n    easy to write log file format definition.\n"
+email: 
 - willem@railsdoctors.com
 - bart@railsdoctors.com
-executables:
+executables: 
 - request-log-analyzer
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -218,41 +210,39 @@ files:
 - spec/unit/tracker/traffic_tracker_spec.rb
 - tasks/github-gem.rake
 - tasks/request_log_analyzer.rake
-has_rdoc: true
 homepage: http://railsdoctors.com
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - request-log-analyzer
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
-- To use the database inserter, ActiveRecord and an appropriate database adapter are
-  required.
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+requirements: 
+- To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
-  and other web application servers
-test_files:
+summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers
+test_files: 
 - spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/integration/munin_plugins_rails_spec.rb